coverage: Split out MC/DC mappings from BcbMappingKind
#124603
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @Nadrieril rustbot has assigned @Nadrieril. Use |
rustbot
added
S-waiting-on-review
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
rustbot
added
the
A-code-coverage
This comment has been minimized.
This comment has been minimized.
Zalathar
force-pushed
the
mcdc-mappings
branch
2 times, most recently
from
f7bfcbd
to
f27f60c
Compare
|
☔ The latest upstream changes (presumably #124675) made this pull request unmergeable. Please resolve the merge conflicts. |
Now that branch and MC/DC mappings have been split out into separate types and vectors, this enum is no longer needed, since it only represents ordinary "code" regions. (We can revisit this decision if we ever add support for other region kinds, such as skipped regions or expansion regions. But at that point, we might just add new structs/vectors for those kinds as well.)
This makes it consistent with the other mapping structs introduced by this PR.
Nadrieril
approved these changes
May 5, 2024
|
@bors r+ |
|
🌲 The tree is currently closed for pull requests below priority 9999. This pull request will be tested once the tree is reopened. |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (9c9b568): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)This benchmark run did not return any relevant results for this metric. CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 675.62s -> 676.55s (0.14%) |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 10, 2024
…idtwco coverage: Further simplify extraction of mapping info from MIR This is another round of rearrangement and simplification that builds on top of the changes made to mapping-extraction by rust-lang#124603. The overall theme is to take the computation of `bcb_has_mappings` and `test_vector_bitmap_bytes` out of the main body of `generate_coverage_spans`, which then lets us perform a few other small changes that had previously been held up by the need to work around those computations.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 10, 2024
…idtwco coverage: Further simplify extraction of mapping info from MIR This is another round of rearrangement and simplification that builds on top of the changes made to mapping-extraction by rust-lang#124603. The overall theme is to take the computation of `bcb_has_mappings` and `test_vector_bitmap_bytes` out of the main body of `generate_coverage_spans`, which then lets us perform a few other small changes that had previously been held up by the need to work around those computations.
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 10, 2024
Rollup merge of rust-lang#124615 - Zalathar:extracted-mappings, r=davidtwco coverage: Further simplify extraction of mapping info from MIR This is another round of rearrangement and simplification that builds on top of the changes made to mapping-extraction by rust-lang#124603. The overall theme is to take the computation of `bcb_has_mappings` and `test_vector_bitmap_bytes` out of the main body of `generate_coverage_spans`, which then lets us perform a few other small changes that had previously been held up by the need to work around those computations.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These variants were added to
BcbMappingKindas part of the MC/DC coverage implementation in #123409, because that was the path-of-least-resistance for integrating them into the existing code.However, they ultimately represent complex concepts that the enum was not intended to handle, leading to more complexity in the code that processes them. This PR therefore follows in the footsteps of #124545, and splits the MC/DC mappings out into their own dedicated vectors of structs.
After that,
BcbMappingKinditself ends up having only one variant (Code), so this PR also flattens that enum into its enclosing struct, renamed tomapping::CodeMapping.No functional changes.
This will conflict slightly with #124571, but hopefully that should be easy to resolve either way.
@rustbot label +A-code-coverage